merge trunk
authorKenichi Handa <handa@m17n.org>
Tue, 2 Aug 2011 00:37:05 +0000 (09:37 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 2 Aug 2011 00:37:05 +0000 (09:37 +0900)
commit3995f369c1e1c824326c76f086158eaf187dcfcd
tree4be42be80a77e2e03592a62bce52b216abafe8bf
parent0be5401a9a632dd2d78bc21a4cc2125756558e11
parentae97d14bcda6fcd8ded0a15a12cb9f5d1d3ed813
merge trunk